From: Aaron Schulz <aschulz@wikimedia.org>
Date: Fri, 1 May 2015 21:53:41 +0000 (-0700)
Subject: Pass __METHOD__ to ping query in JobRunner::commitMasterChanges()
X-Git-Tag: 1.31.0-rc.0~11501^2
X-Git-Url: http://git.cyclocoop.org/%28%5B%5E/404?a=commitdiff_plain;h=fa07f92527048ae477da6f859924248702375c46;p=lhc%2Fweb%2Fwiklou.git

Pass __METHOD__ to ping query in JobRunner::commitMasterChanges()

Change-Id: I7f79acca0f89a2e07ed2f9eb427e0788c5440ee7
---

diff --git a/includes/jobqueue/JobRunner.php b/includes/jobqueue/JobRunner.php
index 4d3da8a555..0948092e67 100644
--- a/includes/jobqueue/JobRunner.php
+++ b/includes/jobqueue/JobRunner.php
@@ -452,12 +452,13 @@ class JobRunner implements LoggerAwareInterface {
 			$lb->waitForOne( $pos );
 		}
 
+		$fname = __METHOD__;
 		// Re-ping all masters with transactions. This throws DBError if some
 		// connection died while waiting on locks/slaves, triggering a rollback.
-		wfGetLBFactory()->forEachLB( function( LoadBalancer $lb ) {
-			$lb->forEachOpenConnection( function( DatabaseBase $conn ) {
+		wfGetLBFactory()->forEachLB( function( LoadBalancer $lb ) use ( $fname ) {
+			$lb->forEachOpenConnection( function( DatabaseBase $conn ) use ( $fname ) {
 				if ( $conn->writesOrCallbacksPending() ) {
-					$conn->query( "SELECT 1" );
+					$conn->query( "SELECT 1", $fname );
 				}
 			} );
 		} );